From 15ea081b5fc55ccc3318ab09903fb1760a49ec11 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 30 Mar 2005 18:20:59 +0000 Subject: [PATCH] Make enable_search control only typeahead, not C-f. (#170435, Sven 2005-03-30 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): Make enable_search control only typeahead, not C-f. (#170435, Sven Neumann) (gtk_tree_view_start_interactive_search): Pass keybinding == TRUE. --- ChangeLog | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gtk/gtktreeview.c | 20 ++++++++------------ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ace7cd56ce..8b72d3cb3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-03-30 Matthias Clasen - + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + Make enable_search control only typeahead, not C-f. (#170435, + Sven Neumann) + (gtk_tree_view_start_interactive_search): Pass keybinding == TRUE. + * gdk/gdkpixbuf.h: Include cairo.h * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ace7cd56ce..8b72d3cb3b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2005-03-30 Matthias Clasen - + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + Make enable_search control only typeahead, not C-f. (#170435, + Sven Neumann) + (gtk_tree_view_start_interactive_search): Pass keybinding == TRUE. + * gdk/gdkpixbuf.h: Include cairo.h * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ace7cd56ce..8b72d3cb3b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2005-03-30 Matthias Clasen - + + * gtk/gtktreeview.c (gtk_tree_view_real_start_interactive_search): + Make enable_search control only typeahead, not C-f. (#170435, + Sven Neumann) + (gtk_tree_view_start_interactive_search): Pass keybinding == TRUE. + * gdk/gdkpixbuf.h: Include cairo.h * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 39bac58ff1..d85df0b050 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8982,7 +8982,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, gboolean found_focus = FALSE; GtkWidgetClass *entry_parent_class; - if (!tree_view->priv->enable_search) + if (!tree_view->priv->enable_search && !keybinding) return FALSE; if (GTK_WIDGET_VISIBLE (tree_view->priv->search_window)) @@ -9015,9 +9015,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, gtk_tree_view_ensure_interactive_directory (tree_view); if (keybinding) - { - gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), ""); - } + gtk_entry_set_text (GTK_ENTRY (tree_view->priv->search_entry), ""); /* done, show it */ tree_view->priv->search_dialog_position_func (tree_view, tree_view->priv->search_window); @@ -9029,13 +9027,11 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, G_CALLBACK (gtk_tree_view_search_init), tree_view); } - if (! keybinding) - { - tree_view->priv->typeselect_flush_timeout = - g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, - (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, - tree_view); - } + + tree_view->priv->typeselect_flush_timeout = + g_timeout_add (GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT, + (GSourceFunc) gtk_tree_view_search_entry_flush_timeout, + tree_view); /* Grab focus will select all the text. We don't want that to happen, so we * call the parent instance and bypass the selection change. This is probably @@ -9055,7 +9051,7 @@ gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_view, static gboolean gtk_tree_view_start_interactive_search (GtkTreeView *tree_view) { - return gtk_tree_view_real_start_interactive_search (tree_view, FALSE); + return gtk_tree_view_real_start_interactive_search (tree_view, TRUE); } /* this function returns the new width of the column being resized given * the column and x position of the cursor; the x cursor position is passed -- 2.30.2